Manual merge -- hg not so good at deleting right now.
authorakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Sun, 3 Jul 2005 18:49:55 +0000 (18:49 +0000)
committerakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Sun, 3 Jul 2005 18:49:55 +0000 (18:49 +0000)
Signed-off-by: akw27@cam.ac.uk

Trivial merge